noexcept for <vector>. This also includes installing move_if_noexcept() into vector. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@132577 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/vector b/include/vector index f067743..e30ce78 100644 --- a/include/vector +++ b/include/vector
@@ -34,47 +34,53 @@ typedef std::reverse_iterator<iterator> reverse_iterator; typedef std::reverse_iterator<const_iterator> const_reverse_iterator; - explicit vector(const allocator_type& = allocator_type()); + vector() + noexcept(is_nothrow_default_constructible<allocator_type>::value); + explicit vector(const allocator_type&); explicit vector(size_type n); vector(size_type n, const value_type& value, const allocator_type& = allocator_type()); template <class InputIterator> vector(InputIterator first, InputIterator last, const allocator_type& = allocator_type()); vector(const vector& x); - vector(vector&& x); + vector(vector&& x) + noexcept(is_nothrow_move_constructible<allocator_type>::value); vector(initializer_list<value_type> il); vector(initializer_list<value_type> il, const allocator_type& a); ~vector(); vector& operator=(const vector& x); - vector& operator=(vector&& x); + vector& operator=(vector&& x) + noexcept( + allocator_type::propagate_on_container_move_assignment::value && + is_nothrow_move_assignable<allocator_type>::value); vector& operator=(initializer_list<value_type> il); template <class InputIterator> void assign(InputIterator first, InputIterator last); void assign(size_type n, const value_type& u); void assign(initializer_list<value_type> il); - allocator_type get_allocator() const; + allocator_type get_allocator() const noexcept; - iterator begin(); - const_iterator begin() const; - iterator end(); - const_iterator end() const; + iterator begin() noexcept; + const_iterator begin() const noexcept; + iterator end() noexcept; + const_iterator end() const noexcept; - reverse_iterator rbegin(); - const_reverse_iterator rbegin() const; - reverse_iterator rend(); - const_reverse_iterator rend() const; + reverse_iterator rbegin() noexcept; + const_reverse_iterator rbegin() const noexcept; + reverse_iterator rend() noexcept; + const_reverse_iterator rend() const noexcept; - const_iterator cbegin() const; - const_iterator cend() const; - const_reverse_iterator crbegin() const; - const_reverse_iterator crend() const; + const_iterator cbegin() const noexcept; + const_iterator cend() const noexcept; + const_reverse_iterator crbegin() const noexcept; + const_reverse_iterator crend() const noexcept; - size_type size() const; - size_type max_size() const; - size_type capacity() const; - bool empty() const; + size_type size() const noexcept; + size_type max_size() const noexcept; + size_type capacity() const noexcept; + bool empty() const noexcept; void reserve(size_type n); - void shrink_to_fit(); + void shrink_to_fit() noexcept; reference operator[](size_type n); const_reference operator[](size_type n) const; @@ -86,8 +92,8 @@ reference back(); const_reference back() const; - value_type* data(); - const value_type* data() const; + value_type* data() noexcept; + const value_type* data() const noexcept; void push_back(const value_type& x); void push_back(value_type&& x); @@ -106,12 +112,14 @@ iterator erase(const_iterator position); iterator erase(const_iterator first, const_iterator last); - void clear(); + void clear() noexcept; void resize(size_type sz); void resize(size_type sz, const value_type& c); - void swap(vector&); + void swap(vector&) + noexcept(!allocator_type::propagate_on_container_swap::value || + __is_nothrow_swappable<allocator_type>::value); bool __invariants() const; }; @@ -134,62 +142,68 @@ class reference { public: - reference(const reference&); - operator bool() const; - reference& operator=(const bool x); - reference& operator=(const reference& x); - iterator operator&() const; - void flip(); + reference(const reference&) noexcept; + operator bool() const noexcept; + reference& operator=(const bool x) noexcept; + reference& operator=(const reference& x) noexcept; + iterator operator&() const noexcept; + void flip() noexcept; }; class const_reference { public: - const_reference(const reference&); - operator bool() const; - const_iterator operator&() const; + const_reference(const reference&) noexcept; + operator bool() const noexcept; + const_iterator operator&() const noexcept; }; + vector() + noexcept(is_nothrow_default_constructible<allocator_type>::value); explicit vector(const allocator_type& = allocator_type()); explicit vector(size_type n, const value_type& value = value_type(), const allocator_type& = allocator_type()); template <class InputIterator> vector(InputIterator first, InputIterator last, const allocator_type& = allocator_type()); vector(const vector& x); - vector(vector&& x); + vector(vector&& x) + noexcept(is_nothrow_move_constructible<allocator_type>::value); vector(initializer_list<value_type> il); vector(initializer_list<value_type> il, const allocator_type& a); ~vector(); vector& operator=(const vector& x); - vector& operator=(vector&& x); + vector& operator=(vector&& x) + noexcept( + allocator_type::propagate_on_container_move_assignment::value && + is_nothrow_move_assignable<allocator_type>::value); vector& operator=(initializer_list<value_type> il); template <class InputIterator> void assign(InputIterator first, InputIterator last); void assign(size_type n, const value_type& u); void assign(initializer_list<value_type> il); - allocator_type get_allocator() const; + allocator_type get_allocator() const noexcept; - iterator begin(); - const_iterator begin() const; - iterator end(); - const_iterator end() const; + iterator begin() noexcept; + const_iterator begin() const noexcept; + iterator end() noexcept; + const_iterator end() const noexcept; - reverse_iterator rbegin(); - const_reverse_iterator rbegin() const; - reverse_iterator rend(); - const_reverse_iterator rend() const; + reverse_iterator rbegin() noexcept; + const_reverse_iterator rbegin() const noexcept; + reverse_iterator rend() noexcept; + const_reverse_iterator rend() const noexcept; - const_iterator cbegin() const; - const_iterator cend() const; - const_reverse_iterator crbegin() const; - const_reverse_iterator crend() const; + const_iterator cbegin() const noexcept; + const_iterator cend() const noexcept; + const_reverse_iterator crbegin() const noexcept; + const_reverse_iterator crend() const noexcept; - size_type size() const; - size_type max_size() const; - size_type capacity() const; - bool empty() const; + size_type size() const noexcept; + size_type max_size() const noexcept; + size_type capacity() const noexcept; + bool empty() const noexcept; void reserve(size_type n); - void shrink_to_fit(); + void shrink_to_fit() noexcept; reference operator[](size_type n); const_reference operator[](size_type n) const; @@ -213,13 +227,15 @@ iterator erase(const_iterator position); iterator erase(const_iterator first, const_iterator last); - void clear(); + void clear() noexcept; void resize(size_type sz); void resize(size_type sz, value_type x); - void swap(vector&); - void flip(); + void swap(vector&) + noexcept(!allocator_type::propagate_on_container_swap::value || + __is_nothrow_swappable<allocator_type>::value); + void flip() noexcept; bool __invariants() const; }; @@ -233,7 +249,9 @@ template <class T, class Allocator> bool operator>=(const vector<T,Allocator>& x, const vector<T,Allocator>& y); template <class T, class Allocator> bool operator<=(const vector<T,Allocator>& x, const vector<T,Allocator>& y); -template <class T, class Allocator> void swap(vector<T,Allocator>& x, vector<T,Allocator>& y); +template <class T, class Allocator> +void swap(vector<T,Allocator>& x, vector<T,Allocator>& y) + noexcept(noexcept(x.swap(y))); } // std @@ -313,22 +331,38 @@ pointer __end_; __compressed_pair<pointer, allocator_type> __end_cap_; - _LIBCPP_INLINE_VISIBILITY allocator_type& __alloc() {return __end_cap_.second();} - _LIBCPP_INLINE_VISIBILITY const allocator_type& __alloc() const {return __end_cap_.second();} - _LIBCPP_INLINE_VISIBILITY pointer& __end_cap() {return __end_cap_.first();} - _LIBCPP_INLINE_VISIBILITY const pointer& __end_cap() const {return __end_cap_.first();} + _LIBCPP_INLINE_VISIBILITY + allocator_type& __alloc() _NOEXCEPT + {return __end_cap_.second();} + _LIBCPP_INLINE_VISIBILITY + const allocator_type& __alloc() const _NOEXCEPT + {return __end_cap_.second();} + _LIBCPP_INLINE_VISIBILITY + pointer& __end_cap() _NOEXCEPT + {return __end_cap_.first();} + _LIBCPP_INLINE_VISIBILITY + const pointer& __end_cap() const _NOEXCEPT + {return __end_cap_.first();} - _LIBCPP_INLINE_VISIBILITY __vector_base(); + _LIBCPP_INLINE_VISIBILITY + __vector_base() + _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value); _LIBCPP_INLINE_VISIBILITY __vector_base(const allocator_type& __a); ~__vector_base(); - _LIBCPP_INLINE_VISIBILITY void clear() {__destruct_at_end(__begin_);} - _LIBCPP_INLINE_VISIBILITY size_type capacity() const {return static_cast<size_type>(__end_cap() - __begin_);} + _LIBCPP_INLINE_VISIBILITY + void clear() _NOEXCEPT {__destruct_at_end(__begin_);} + _LIBCPP_INLINE_VISIBILITY + size_type capacity() const _NOEXCEPT + {return static_cast<size_type>(__end_cap() - __begin_);} - _LIBCPP_INLINE_VISIBILITY void __destruct_at_end(const_pointer __new_last) + _LIBCPP_INLINE_VISIBILITY + void __destruct_at_end(const_pointer __new_last) _NOEXCEPT {__destruct_at_end(__new_last, is_trivially_destructible<value_type>());} - _LIBCPP_INLINE_VISIBILITY void __destruct_at_end(const_pointer __new_last, false_type); - _LIBCPP_INLINE_VISIBILITY void __destruct_at_end(const_pointer __new_last, true_type); + _LIBCPP_INLINE_VISIBILITY + void __destruct_at_end(const_pointer __new_last, false_type) _NOEXCEPT; + _LIBCPP_INLINE_VISIBILITY + void __destruct_at_end(const_pointer __new_last, true_type) _NOEXCEPT; _LIBCPP_INLINE_VISIBILITY void __copy_assign_alloc(const __vector_base& __c) @@ -337,11 +371,17 @@ _LIBCPP_INLINE_VISIBILITY void __move_assign_alloc(__vector_base& __c) + _NOEXCEPT_( + !__alloc_traits::propagate_on_container_move_assignment::value || + is_nothrow_move_assignable<allocator_type>::value) {__move_assign_alloc(__c, integral_constant<bool, __alloc_traits::propagate_on_container_move_assignment::value>());} _LIBCPP_INLINE_VISIBILITY static void __swap_alloc(allocator_type& __x, allocator_type& __y) + _NOEXCEPT_( + !__alloc_traits::propagate_on_container_swap::value || + __is_nothrow_swappable<allocator_type>::value) {__swap_alloc(__x, __y, integral_constant<bool, __alloc_traits::propagate_on_container_swap::value>());} private: @@ -363,29 +403,33 @@ _LIBCPP_INLINE_VISIBILITY void __move_assign_alloc(const __vector_base& __c, true_type) + _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value) { __alloc() = _STD::move(__c.__alloc()); } _LIBCPP_INLINE_VISIBILITY void __move_assign_alloc(const __vector_base& __c, false_type) + _NOEXCEPT {} _LIBCPP_INLINE_VISIBILITY static void __swap_alloc(allocator_type& __x, allocator_type& __y, true_type) + _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value) { using _STD::swap; swap(__x, __y); } _LIBCPP_INLINE_VISIBILITY static void __swap_alloc(allocator_type& __x, allocator_type& __y, false_type) + _NOEXCEPT {} }; template <class _Tp, class _Allocator> _LIBCPP_INLINE_VISIBILITY inline void -__vector_base<_Tp, _Allocator>::__destruct_at_end(const_pointer __new_last, false_type) +__vector_base<_Tp, _Allocator>::__destruct_at_end(const_pointer __new_last, false_type) _NOEXCEPT { while (__new_last < __end_) __alloc_traits::destroy(__alloc(), const_cast<pointer>(--__end_)); @@ -394,7 +438,7 @@ template <class _Tp, class _Allocator> _LIBCPP_INLINE_VISIBILITY inline void -__vector_base<_Tp, _Allocator>::__destruct_at_end(const_pointer __new_last, true_type) +__vector_base<_Tp, _Allocator>::__destruct_at_end(const_pointer __new_last, true_type) _NOEXCEPT { __end_ = const_cast<pointer>(__new_last); } @@ -402,6 +446,7 @@ template <class _Tp, class _Allocator> _LIBCPP_INLINE_VISIBILITY inline __vector_base<_Tp, _Allocator>::__vector_base() + _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value) : __begin_(0), __end_(0), __end_cap_(0) @@ -465,7 +510,10 @@ typedef _STD::reverse_iterator<iterator> reverse_iterator; typedef _STD::reverse_iterator<const_iterator> const_reverse_iterator; - _LIBCPP_INLINE_VISIBILITY vector() {} + _LIBCPP_INLINE_VISIBILITY + vector() + _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value) + {} _LIBCPP_INLINE_VISIBILITY explicit vector(const allocator_type& __a) : __base(__a) {} explicit vector(size_type __n); vector(size_type __n, const_reference __x); @@ -499,11 +547,15 @@ vector& operator=(const vector& __x); #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY - vector(vector&& __x); + vector(vector&& __x) + _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value); _LIBCPP_INLINE_VISIBILITY vector(vector&& __x, const allocator_type& __a); _LIBCPP_INLINE_VISIBILITY - vector& operator=(vector&& __x); + vector& operator=(vector&& __x) + _NOEXCEPT_( + __alloc_traits::propagate_on_container_move_assignment::value && + is_nothrow_move_assignable<allocator_type>::value); #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY vector& operator=(initializer_list<value_type> __il) @@ -530,29 +582,53 @@ void assign(initializer_list<value_type> __il) {assign(__il.begin(), __il.end());} - _LIBCPP_INLINE_VISIBILITY allocator_type get_allocator() const {return this->__alloc();} + _LIBCPP_INLINE_VISIBILITY + allocator_type get_allocator() const _NOEXCEPT + {return this->__alloc();} - _LIBCPP_INLINE_VISIBILITY iterator begin(); - _LIBCPP_INLINE_VISIBILITY const_iterator begin() const; - _LIBCPP_INLINE_VISIBILITY iterator end(); - _LIBCPP_INLINE_VISIBILITY const_iterator end() const; + _LIBCPP_INLINE_VISIBILITY iterator begin() _NOEXCEPT; + _LIBCPP_INLINE_VISIBILITY const_iterator begin() const _NOEXCEPT; + _LIBCPP_INLINE_VISIBILITY iterator end() _NOEXCEPT; + _LIBCPP_INLINE_VISIBILITY const_iterator end() const _NOEXCEPT; - _LIBCPP_INLINE_VISIBILITY reverse_iterator rbegin() {return reverse_iterator(end());} - _LIBCPP_INLINE_VISIBILITY const_reverse_iterator rbegin() const {return const_reverse_iterator(end());} - _LIBCPP_INLINE_VISIBILITY reverse_iterator rend() {return reverse_iterator(begin());} - _LIBCPP_INLINE_VISIBILITY const_reverse_iterator rend() const {return const_reverse_iterator(begin());} + _LIBCPP_INLINE_VISIBILITY + reverse_iterator rbegin() _NOEXCEPT + {return reverse_iterator(end());} + _LIBCPP_INLINE_VISIBILITY + const_reverse_iterator rbegin() const _NOEXCEPT + {return const_reverse_iterator(end());} + _LIBCPP_INLINE_VISIBILITY + reverse_iterator rend() _NOEXCEPT + {return reverse_iterator(begin());} + _LIBCPP_INLINE_VISIBILITY + const_reverse_iterator rend() const _NOEXCEPT + {return const_reverse_iterator(begin());} - _LIBCPP_INLINE_VISIBILITY const_iterator cbegin() const {return begin();} - _LIBCPP_INLINE_VISIBILITY const_iterator cend() const {return end();} - _LIBCPP_INLINE_VISIBILITY const_reverse_iterator crbegin() const {return rbegin();} - _LIBCPP_INLINE_VISIBILITY const_reverse_iterator crend() const {return rend();} + _LIBCPP_INLINE_VISIBILITY + const_iterator cbegin() const _NOEXCEPT + {return begin();} + _LIBCPP_INLINE_VISIBILITY + const_iterator cend() const _NOEXCEPT + {return end();} + _LIBCPP_INLINE_VISIBILITY + const_reverse_iterator crbegin() const _NOEXCEPT + {return rbegin();} + _LIBCPP_INLINE_VISIBILITY + const_reverse_iterator crend() const _NOEXCEPT + {return rend();} - _LIBCPP_INLINE_VISIBILITY size_type size() const {return static_cast<size_type>(this->__end_ - this->__begin_);} - _LIBCPP_INLINE_VISIBILITY size_type capacity() const {return __base::capacity();} - _LIBCPP_INLINE_VISIBILITY bool empty() const {return this->__begin_ == this->__end_;} - size_type max_size() const; + _LIBCPP_INLINE_VISIBILITY + size_type size() const _NOEXCEPT + {return static_cast<size_type>(this->__end_ - this->__begin_);} + _LIBCPP_INLINE_VISIBILITY + size_type capacity() const _NOEXCEPT + {return __base::capacity();} + _LIBCPP_INLINE_VISIBILITY + bool empty() const _NOEXCEPT + {return this->__begin_ == this->__end_;} + size_type max_size() const _NOEXCEPT; void reserve(size_type __n); - void shrink_to_fit(); + void shrink_to_fit() _NOEXCEPT; _LIBCPP_INLINE_VISIBILITY reference operator[](size_type __n); _LIBCPP_INLINE_VISIBILITY const_reference operator[](size_type __n) const; @@ -564,9 +640,11 @@ _LIBCPP_INLINE_VISIBILITY reference back() {return *(this->__end_ - 1);} _LIBCPP_INLINE_VISIBILITY const_reference back() const {return *(this->__end_ - 1);} - _LIBCPP_INLINE_VISIBILITY value_type* data() + _LIBCPP_INLINE_VISIBILITY + value_type* data() _NOEXCEPT {return _STD::__to_raw_pointer(this->__begin_);} - _LIBCPP_INLINE_VISIBILITY const value_type* data() const + _LIBCPP_INLINE_VISIBILITY + const value_type* data() const _NOEXCEPT {return _STD::__to_raw_pointer(this->__begin_);} _LIBCPP_INLINE_VISIBILITY void push_back(const_reference __x); @@ -610,19 +688,23 @@ _LIBCPP_INLINE_VISIBILITY iterator erase(const_iterator __position); iterator erase(const_iterator __first, const_iterator __last); - _LIBCPP_INLINE_VISIBILITY void clear() {__base::clear();} + _LIBCPP_INLINE_VISIBILITY + void clear() _NOEXCEPT + {__base::clear();} void resize(size_type __sz); void resize(size_type __sz, const_reference __x); - void swap(vector&); + void swap(vector&) + _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value || + __is_nothrow_swappable<allocator_type>::value); bool __invariants() const; private: _LIBCPP_INLINE_VISIBILITY void __invalidate_all_iterators(); void allocate(size_type __n); - void deallocate(); + void deallocate() _NOEXCEPT; _LIBCPP_INLINE_VISIBILITY size_type __recommend(size_type __new_size) const; void __construct_at_end(size_type __n); void __construct_at_end(size_type __n, const_reference __x); @@ -637,13 +719,14 @@ void __append(size_type __n); void __append(size_type __n, const_reference __x); _LIBCPP_INLINE_VISIBILITY - iterator __make_iter(pointer __p); + iterator __make_iter(pointer __p) _NOEXCEPT; _LIBCPP_INLINE_VISIBILITY - const_iterator __make_iter(const_pointer __p) const; + const_iterator __make_iter(const_pointer __p) const _NOEXCEPT; void __swap_out_circular_buffer(__split_buffer<value_type, allocator_type&>& __v); pointer __swap_out_circular_buffer(__split_buffer<value_type, allocator_type&>& __v, pointer __p); void __move_range(pointer __from_s, pointer __from_e, pointer __to); - void __move_assign(vector& __c, true_type); + void __move_assign(vector& __c, true_type) + _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value); void __move_assign(vector& __c, false_type); }; @@ -652,7 +735,7 @@ vector<_Tp, _Allocator>::__swap_out_circular_buffer(__split_buffer<value_type, allocator_type&>& __v) { for (pointer __p = this->__end_; this->__begin_ < __p;) - __v.push_front(_STD::move(*--__p)); + __v.push_front(_STD::move_if_noexcept(*--__p)); _STD::swap(this->__begin_, __v.__begin_); _STD::swap(this->__end_, __v.__end_); _STD::swap(this->__end_cap(), __v.__end_cap()); @@ -666,9 +749,9 @@ { pointer __r = __v.__begin_; for (pointer __i = __p; this->__begin_ < __i;) - __v.push_front(_STD::move(*--__i)); + __v.push_front(_STD::move_if_noexcept(*--__i)); for (pointer __i = __p; __i < this->__end_; ++__i) - __v.push_back(_STD::move(*__i)); + __v.push_back(_STD::move_if_noexcept(*__i)); _STD::swap(this->__begin_, __v.__begin_); _STD::swap(this->__end_, __v.__end_); _STD::swap(this->__end_cap(), __v.__end_cap()); @@ -696,7 +779,7 @@ template <class _Tp, class _Allocator> void -vector<_Tp, _Allocator>::deallocate() +vector<_Tp, _Allocator>::deallocate() _NOEXCEPT { if (this->__begin_ != 0) { @@ -709,7 +792,7 @@ template <class _Tp, class _Allocator> typename vector<_Tp, _Allocator>::size_type -vector<_Tp, _Allocator>::max_size() const +vector<_Tp, _Allocator>::max_size() const _NOEXCEPT { return _STD::min(__alloc_traits::max_size(this->__alloc()), numeric_limits<size_type>::max() / 2); // end() >= begin(), always } @@ -800,7 +883,7 @@ // Default constructs __n objects starting at __end_ // throws if construction throws // Postcondition: size() == size() + __n -// Exception safety: strong but assumes move ctor doesn't throw (copy ctor can) +// Exception safety: strong. template <class _Tp, class _Allocator> void vector<_Tp, _Allocator>::__append(size_type __n) @@ -819,7 +902,7 @@ // Default constructs __n objects starting at __end_ // throws if construction throws // Postcondition: size() == size() + __n -// Exception safety: strong but assumes move ctor doesn't throw (copy ctor can) +// Exception safety: strong. template <class _Tp, class _Allocator> void vector<_Tp, _Allocator>::__append(size_type __n, const_reference __x) @@ -943,6 +1026,7 @@ template <class _Tp, class _Allocator> _LIBCPP_INLINE_VISIBILITY inline vector<_Tp, _Allocator>::vector(vector&& __x) + _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value) : __base(_STD::move(__x.__alloc())) { this->__begin_ = __x.__begin_; @@ -999,6 +1083,9 @@ _LIBCPP_INLINE_VISIBILITY inline vector<_Tp, _Allocator>& vector<_Tp, _Allocator>::operator=(vector&& __x) + _NOEXCEPT_( + __alloc_traits::propagate_on_container_move_assignment::value && + is_nothrow_move_assignable<allocator_type>::value) { __move_assign(__x, integral_constant<bool, __alloc_traits::propagate_on_container_move_assignment::value>()); @@ -1021,6 +1108,7 @@ template <class _Tp, class _Allocator> void vector<_Tp, _Allocator>::__move_assign(vector& __c, true_type) + _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value) { deallocate(); this->__begin_ = __c.__begin_; @@ -1118,7 +1206,7 @@ template <class _Tp, class _Allocator> _LIBCPP_INLINE_VISIBILITY inline typename vector<_Tp, _Allocator>::iterator -vector<_Tp, _Allocator>::__make_iter(pointer __p) +vector<_Tp, _Allocator>::__make_iter(pointer __p) _NOEXCEPT { #ifdef _LIBCPP_DEBUG return iterator(this, __p); @@ -1130,7 +1218,7 @@ template <class _Tp, class _Allocator> _LIBCPP_INLINE_VISIBILITY inline typename vector<_Tp, _Allocator>::const_iterator -vector<_Tp, _Allocator>::__make_iter(const_pointer __p) const +vector<_Tp, _Allocator>::__make_iter(const_pointer __p) const _NOEXCEPT { #ifdef _LIBCPP_DEBUG return const_iterator(this, __p); @@ -1142,7 +1230,7 @@ template <class _Tp, class _Allocator> _LIBCPP_INLINE_VISIBILITY inline typename vector<_Tp, _Allocator>::iterator -vector<_Tp, _Allocator>::begin() +vector<_Tp, _Allocator>::begin() _NOEXCEPT { return __make_iter(this->__begin_); } @@ -1150,7 +1238,7 @@ template <class _Tp, class _Allocator> _LIBCPP_INLINE_VISIBILITY inline typename vector<_Tp, _Allocator>::const_iterator -vector<_Tp, _Allocator>::begin() const +vector<_Tp, _Allocator>::begin() const _NOEXCEPT { return __make_iter(this->__begin_); } @@ -1158,7 +1246,7 @@ template <class _Tp, class _Allocator> _LIBCPP_INLINE_VISIBILITY inline typename vector<_Tp, _Allocator>::iterator -vector<_Tp, _Allocator>::end() +vector<_Tp, _Allocator>::end() _NOEXCEPT { return __make_iter(this->__end_); } @@ -1166,7 +1254,7 @@ template <class _Tp, class _Allocator> _LIBCPP_INLINE_VISIBILITY inline typename vector<_Tp, _Allocator>::const_iterator -vector<_Tp, _Allocator>::end() const +vector<_Tp, _Allocator>::end() const _NOEXCEPT { return __make_iter(this->__end_); } @@ -1218,17 +1306,14 @@ if (__n > capacity()) { allocator_type& __a = this->__alloc(); - __split_buffer<value_type, allocator_type&> __v(__n, 0, __a); - __v.__construct_at_end(move_iterator<pointer>(this->__begin_), - move_iterator<pointer>(this->__end_)); - clear(); + __split_buffer<value_type, allocator_type&> __v(__n, size(), __a); __swap_out_circular_buffer(__v); } } template <class _Tp, class _Allocator> void -vector<_Tp, _Allocator>::shrink_to_fit() +vector<_Tp, _Allocator>::shrink_to_fit() _NOEXCEPT { if (capacity() > size()) { @@ -1237,10 +1322,7 @@ { #endif // _LIBCPP_NO_EXCEPTIONS allocator_type& __a = this->__alloc(); - __split_buffer<value_type, allocator_type&> __v(size(), 0, __a); - __v.__construct_at_end(move_iterator<pointer>(this->__begin_), - move_iterator<pointer>(this->__end_)); - clear(); + __split_buffer<value_type, allocator_type&> __v(size(), size(), __a); __swap_out_circular_buffer(__v); #ifndef _LIBCPP_NO_EXCEPTIONS } @@ -1613,6 +1695,8 @@ template <class _Tp, class _Allocator> void vector<_Tp, _Allocator>::swap(vector& __x) + _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value || + __is_nothrow_swappable<allocator_type>::value) { _STD::swap(this->__begin_, __x.__begin_); _STD::swap(this->__end_, __x.__end_); @@ -1714,20 +1798,32 @@ size_type __size_; __compressed_pair<size_type, __storage_allocator> __cap_alloc_; - _LIBCPP_INLINE_VISIBILITY size_type& __cap() {return __cap_alloc_.first();} - _LIBCPP_INLINE_VISIBILITY const size_type& __cap() const {return __cap_alloc_.first();} - _LIBCPP_INLINE_VISIBILITY __storage_allocator& __alloc() {return __cap_alloc_.second();} - _LIBCPP_INLINE_VISIBILITY const __storage_allocator& __alloc() const {return __cap_alloc_.second();} + _LIBCPP_INLINE_VISIBILITY + size_type& __cap() _NOEXCEPT + {return __cap_alloc_.first();} + _LIBCPP_INLINE_VISIBILITY + const size_type& __cap() const _NOEXCEPT + {return __cap_alloc_.first();} + _LIBCPP_INLINE_VISIBILITY + __storage_allocator& __alloc() _NOEXCEPT + {return __cap_alloc_.second();} + _LIBCPP_INLINE_VISIBILITY + const __storage_allocator& __alloc() const _NOEXCEPT + {return __cap_alloc_.second();} static const unsigned __bits_per_word = static_cast<unsigned>(sizeof(__storage_type) * CHAR_BIT); - _LIBCPP_INLINE_VISIBILITY static size_type __internal_cap_to_external(size_type __n) + _LIBCPP_INLINE_VISIBILITY + static size_type __internal_cap_to_external(size_type __n) _NOEXCEPT {return __n * __bits_per_word;} - _LIBCPP_INLINE_VISIBILITY static size_type __external_cap_to_internal(size_type __n) + _LIBCPP_INLINE_VISIBILITY + static size_type __external_cap_to_internal(size_type __n) _NOEXCEPT {return (__n - 1) / __bits_per_word + 1;} public: - _LIBCPP_INLINE_VISIBILITY vector(); + _LIBCPP_INLINE_VISIBILITY + vector() + _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value); _LIBCPP_INLINE_VISIBILITY explicit vector(const allocator_type& __a); ~vector(); explicit vector(size_type __n); @@ -1755,9 +1851,15 @@ vector(initializer_list<value_type> __il, const allocator_type& __a); #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES - _LIBCPP_INLINE_VISIBILITY vector(vector&& __v); + _LIBCPP_INLINE_VISIBILITY + vector(vector&& __v) + _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value); vector(vector&& __v, const allocator_type& __a); - _LIBCPP_INLINE_VISIBILITY vector& operator=(vector&& __v); + _LIBCPP_INLINE_VISIBILITY + vector& operator=(vector&& __v) + _NOEXCEPT_( + __alloc_traits::propagate_on_container_move_assignment::value && + is_nothrow_move_assignable<allocator_type>::value); #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY vector& operator=(initializer_list<value_type> __il) @@ -1784,30 +1886,60 @@ void assign(initializer_list<value_type> __il) {assign(__il.begin(), __il.end());} - _LIBCPP_INLINE_VISIBILITY allocator_type get_allocator() const + _LIBCPP_INLINE_VISIBILITY allocator_type get_allocator() const _NOEXCEPT {return allocator_type(this->__alloc());} - size_type max_size() const; - _LIBCPP_INLINE_VISIBILITY size_type capacity() const {return __internal_cap_to_external(__cap());} - _LIBCPP_INLINE_VISIBILITY size_type size() const {return __size_;} - _LIBCPP_INLINE_VISIBILITY bool empty() const {return __size_ == 0;} + size_type max_size() const _NOEXCEPT; + _LIBCPP_INLINE_VISIBILITY + size_type capacity() const _NOEXCEPT + {return __internal_cap_to_external(__cap());} + _LIBCPP_INLINE_VISIBILITY + size_type size() const _NOEXCEPT + {return __size_;} + _LIBCPP_INLINE_VISIBILITY + bool empty() const _NOEXCEPT + {return __size_ == 0;} void reserve(size_type __n); - void shrink_to_fit(); + void shrink_to_fit() _NOEXCEPT; - _LIBCPP_INLINE_VISIBILITY iterator begin() {return __make_iter(0);} - _LIBCPP_INLINE_VISIBILITY const_iterator begin() const {return __make_iter(0);} - _LIBCPP_INLINE_VISIBILITY iterator end() {return __make_iter(__size_);} - _LIBCPP_INLINE_VISIBILITY const_iterator end() const {return __make_iter(__size_);} + _LIBCPP_INLINE_VISIBILITY + iterator begin() _NOEXCEPT + {return __make_iter(0);} + _LIBCPP_INLINE_VISIBILITY + const_iterator begin() const _NOEXCEPT + {return __make_iter(0);} + _LIBCPP_INLINE_VISIBILITY + iterator end() _NOEXCEPT + {return __make_iter(__size_);} + _LIBCPP_INLINE_VISIBILITY + const_iterator end() const _NOEXCEPT + {return __make_iter(__size_);} - _LIBCPP_INLINE_VISIBILITY reverse_iterator rbegin() {return reverse_iterator(end());} - _LIBCPP_INLINE_VISIBILITY const_reverse_iterator rbegin() const {return const_reverse_iterator(end());} - _LIBCPP_INLINE_VISIBILITY reverse_iterator rend() {return reverse_iterator(begin());} - _LIBCPP_INLINE_VISIBILITY const_reverse_iterator rend() const {return const_reverse_iterator(begin());} + _LIBCPP_INLINE_VISIBILITY + reverse_iterator rbegin() _NOEXCEPT + {return reverse_iterator(end());} + _LIBCPP_INLINE_VISIBILITY + const_reverse_iterator rbegin() const _NOEXCEPT + {return const_reverse_iterator(end());} + _LIBCPP_INLINE_VISIBILITY + reverse_iterator rend() _NOEXCEPT + {return reverse_iterator(begin());} + _LIBCPP_INLINE_VISIBILITY + const_reverse_iterator rend() const _NOEXCEPT + {return const_reverse_iterator(begin());} - _LIBCPP_INLINE_VISIBILITY const_iterator cbegin() const {return __make_iter(0);} - _LIBCPP_INLINE_VISIBILITY const_iterator cend() const {return __make_iter(__size_);} - _LIBCPP_INLINE_VISIBILITY const_reverse_iterator crbegin() const {return rbegin();} - _LIBCPP_INLINE_VISIBILITY const_reverse_iterator crend() const {return rend();} + _LIBCPP_INLINE_VISIBILITY + const_iterator cbegin() const _NOEXCEPT + {return __make_iter(0);} + _LIBCPP_INLINE_VISIBILITY + const_iterator cend() const _NOEXCEPT + {return __make_iter(__size_);} + _LIBCPP_INLINE_VISIBILITY + const_reverse_iterator crbegin() const _NOEXCEPT + {return rbegin();} + _LIBCPP_INLINE_VISIBILITY + const_reverse_iterator crend() const _NOEXCEPT + {return rend();} _LIBCPP_INLINE_VISIBILITY reference operator[](size_type __n) {return __make_ref(__n);} _LIBCPP_INLINE_VISIBILITY const_reference operator[](size_type __n) const {return __make_ref(__n);} @@ -1847,20 +1979,24 @@ _LIBCPP_INLINE_VISIBILITY iterator erase(const_iterator __position); iterator erase(const_iterator __first, const_iterator __last); - _LIBCPP_INLINE_VISIBILITY void clear() {__size_ = 0;} + _LIBCPP_INLINE_VISIBILITY + void clear() _NOEXCEPT {__size_ = 0;} - void swap(vector&); + void swap(vector&) + _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value || + __is_nothrow_swappable<allocator_type>::value); void resize(size_type __sz, value_type __x = false); - void flip(); + void flip() _NOEXCEPT; bool __invariants() const; private: _LIBCPP_INLINE_VISIBILITY void __invalidate_all_iterators(); void allocate(size_type __n); - void deallocate(); - _LIBCPP_INLINE_VISIBILITY static size_type __align(size_type __new_size) + void deallocate() _NOEXCEPT; + _LIBCPP_INLINE_VISIBILITY + static size_type __align(size_type __new_size) _NOEXCEPT {return __new_size + (__bits_per_word-1) & ~(__bits_per_word-1);}; _LIBCPP_INLINE_VISIBILITY size_type __recommend(size_type __new_size) const; _LIBCPP_INLINE_VISIBILITY void __construct_at_end(size_type __n, bool __x); @@ -1872,9 +2008,11 @@ >::type __construct_at_end(_ForwardIterator __first, _ForwardIterator __last); void __append(size_type __n, const_reference __x); - _LIBCPP_INLINE_VISIBILITY reference __make_ref(size_type __pos) + _LIBCPP_INLINE_VISIBILITY + reference __make_ref(size_type __pos) _NOEXCEPT {return reference(__begin_ + __pos / __bits_per_word, __storage_type(1) << __pos % __bits_per_word);} - _LIBCPP_INLINE_VISIBILITY const_reference __make_ref(size_type __pos) const + _LIBCPP_INLINE_VISIBILITY + const_reference __make_ref(size_type __pos) const _NOEXCEPT {return const_reference(__begin_ + __pos / __bits_per_word, __storage_type(1) << __pos % __bits_per_word);} #ifdef _LIBCPP_DEBUG _LIBCPP_INLINE_VISIBILITY iterator __make_iter(size_type __pos) @@ -1884,11 +2022,14 @@ _LIBCPP_INLINE_VISIBILITY iterator __const_iterator_cast(const_iterator __p) {return iterator(this, pointer(const_cast<__storage_pointer>(__p.base().__seg_), __p.base().__ctz_));} #else // _LIBCPP_DEBUG - _LIBCPP_INLINE_VISIBILITY iterator __make_iter(size_type __pos) + _LIBCPP_INLINE_VISIBILITY + iterator __make_iter(size_type __pos) _NOEXCEPT {return iterator(__begin_ + __pos / __bits_per_word, static_cast<unsigned>(__pos % __bits_per_word));} - _LIBCPP_INLINE_VISIBILITY const_iterator __make_iter(size_type __pos) const + _LIBCPP_INLINE_VISIBILITY + const_iterator __make_iter(size_type __pos) const _NOEXCEPT {return const_iterator(__begin_ + __pos / __bits_per_word, static_cast<unsigned>(__pos % __bits_per_word));} - _LIBCPP_INLINE_VISIBILITY iterator __const_iterator_cast(const_iterator __p) + _LIBCPP_INLINE_VISIBILITY + iterator __const_iterator_cast(const_iterator __p) _NOEXCEPT {return iterator(const_cast<__storage_pointer>(__p.__seg_), __p.__ctz_);} #endif // _LIBCPP_DEBUG @@ -1909,37 +2050,48 @@ {} void __move_assign(vector& __c, false_type); - void __move_assign(vector& __c, true_type); + void __move_assign(vector& __c, true_type) + _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value); _LIBCPP_INLINE_VISIBILITY void __move_assign_alloc(vector& __c) + _NOEXCEPT_( + !__storage_traits::propagate_on_container_move_assignment::value || + is_nothrow_move_assignable<allocator_type>::value) {__move_assign_alloc(__c, integral_constant<bool, __storage_traits::propagate_on_container_move_assignment::value>());} _LIBCPP_INLINE_VISIBILITY void __move_assign_alloc(const vector& __c, true_type) + _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value) { __alloc() = _STD::move(__c.__alloc()); } _LIBCPP_INLINE_VISIBILITY void __move_assign_alloc(const vector& __c, false_type) + _NOEXCEPT {} _LIBCPP_INLINE_VISIBILITY static void __swap_alloc(__storage_allocator& __x, __storage_allocator& __y) + _NOEXCEPT_( + !__storage_traits::propagate_on_container_swap::value || + __is_nothrow_swappable<allocator_type>::value) {__swap_alloc(__x, __y, integral_constant<bool, __storage_traits::propagate_on_container_swap::value>());} _LIBCPP_INLINE_VISIBILITY static void __swap_alloc(__storage_allocator& __x, __storage_allocator& __y, true_type) + _NOEXCEPT_(__is_nothrow_swappable<allocator_type>::value) { using _STD::swap; swap(__x, __y); } _LIBCPP_INLINE_VISIBILITY static void __swap_alloc(__storage_allocator& __x, __storage_allocator& __y, false_type) + _NOEXCEPT {} - size_t __hash_code() const; + size_t __hash_code() const _NOEXCEPT; friend class __bit_reference<vector>; friend class __bit_const_reference<vector>; @@ -1983,7 +2135,7 @@ template <class _Allocator> void -vector<bool, _Allocator>::deallocate() +vector<bool, _Allocator>::deallocate() _NOEXCEPT { if (this->__begin_ != 0) { @@ -1996,7 +2148,7 @@ template <class _Allocator> typename vector<bool, _Allocator>::size_type -vector<bool, _Allocator>::max_size() const +vector<bool, _Allocator>::max_size() const _NOEXCEPT { size_type __amax = __storage_traits::max_size(__alloc()); size_type __nmax = numeric_limits<size_type>::max() / 2; // end() >= begin(), always @@ -2051,6 +2203,7 @@ template <class _Allocator> _LIBCPP_INLINE_VISIBILITY inline vector<bool, _Allocator>::vector() + _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value) : __begin_(0), __size_(0), __cap_alloc_(0) @@ -2281,6 +2434,7 @@ template <class _Allocator> _LIBCPP_INLINE_VISIBILITY inline vector<bool, _Allocator>::vector(vector&& __v) + _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value) : __begin_(__v.__begin_), __size_(__v.__size_), __cap_alloc_(__v.__cap_alloc_) @@ -2315,6 +2469,9 @@ _LIBCPP_INLINE_VISIBILITY inline vector<bool, _Allocator>& vector<bool, _Allocator>::operator=(vector&& __v) + _NOEXCEPT_( + __alloc_traits::propagate_on_container_move_assignment::value && + is_nothrow_move_assignable<allocator_type>::value) { __move_assign(__v, integral_constant<bool, __storage_traits::propagate_on_container_move_assignment::value>()); @@ -2333,6 +2490,7 @@ template <class _Allocator> void vector<bool, _Allocator>::__move_assign(vector& __c, true_type) + _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value) { deallocate(); this->__begin_ = __c.__begin_; @@ -2419,7 +2577,7 @@ template <class _Allocator> void -vector<bool, _Allocator>::shrink_to_fit() +vector<bool, _Allocator>::shrink_to_fit() _NOEXCEPT { if (__external_cap_to_internal(size()) > __cap()) { @@ -2618,6 +2776,8 @@ template <class _Allocator> void vector<bool, _Allocator>::swap(vector& __x) + _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value || + __is_nothrow_swappable<allocator_type>::value) { _STD::swap(this->__begin_, __x.__begin_); _STD::swap(this->__size_, __x.__size_); @@ -2660,7 +2820,7 @@ template <class _Allocator> void -vector<bool, _Allocator>::flip() +vector<bool, _Allocator>::flip() _NOEXCEPT { // do middle whole words size_type __n = __size_; @@ -2698,7 +2858,7 @@ template <class _Allocator> size_t -vector<bool, _Allocator>::__hash_code() const +vector<bool, _Allocator>::__hash_code() const _NOEXCEPT { size_t __h = 0; // do middle whole words @@ -2720,7 +2880,7 @@ : public unary_function<vector<bool, _Allocator>, size_t> { _LIBCPP_INLINE_VISIBILITY - size_t operator()(const vector<bool, _Allocator>& __vec) const + size_t operator()(const vector<bool, _Allocator>& __vec) const _NOEXCEPT {return __vec.__hash_code();} }; @@ -2777,6 +2937,7 @@ _LIBCPP_INLINE_VISIBILITY inline void swap(vector<_Tp, _Allocator>& __x, vector<_Tp, _Allocator>& __y) + _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y))) { __x.swap(__y); } 